feat(config): add integrationBranch setting and PR base branch guard#438
Merged
JustAGhosT merged 3 commits intodevfrom Mar 21, 2026
Merged
feat(config): add integrationBranch setting and PR base branch guard#438JustAGhosT merged 3 commits intodevfrom
JustAGhosT merged 3 commits intodevfrom
Conversation
- Add `integrationBranch` field to overlay settings.yaml template
(defaults to defaultBranch, allows dev/main distinction)
- Add `overlays/retort/settings.yaml` — sets integrationBranch: dev
for retort's own generated output
- Add CLAUDE.md template section: Integration Branch header + PR Target
Branch subsection with correct `gh pr create --base` example
- Add synchronize.mjs mapping: `integrationBranch` var from overlay settings
- Add hookify rule template: claude/rules/pr-base-branch.md warns when
`gh pr create` is used without `--base {{integrationBranch}}`
- Regenerate all sync outputs with Retort branding and integrationBranch
This prevents the reverse-merge anti-pattern (PR targeting main instead
of dev) that triggered PR #437. The rule is enforced at the framework
level — every onboarded repo gets the guard baked into its CLAUDE.md and
.claude/rules/pr-base-branch.md automatically.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
Mention Blocks like a regular teammate with your question or request: @blocks review this pull request Run |
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
Contributor
|
Important Review skippedToo many files! This PR contains 300 files, which is 150 over the limit of 150. ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (300)
You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR introduces an explicit integrationBranch configuration to prevent PRs accidentally targeting the production/default branch, and regenerates Retort outputs to surface and enforce the correct PR base branch.
Changes:
- Adds
integrationBranchto overlay settings, including aretortoverlay configured to targetdev. - Updates CLAUDE template content to display integration vs default branch and instruct
gh pr create --base {{integrationBranch}}. - Adds a Hookify-style PR base branch guard rule template and regenerates outputs with Retort branding.
Reviewed changes
Copilot reviewed 300 out of 807 changed files in this pull request and generated 4 comments.
Show a summary per file
Changed files
| File | Description |
|---|---|
| .claude/hooks/warn-uncommitted.sh | Regenerated header branding/source. |
| .claude/hooks/warn-uncommitted.ps1 | Regenerated header branding/source. |
| .claude/hooks/stop-build-check.sh | Regenerated header branding/source. |
| .claude/hooks/stop-build-check.ps1 | Regenerated header branding/source. |
| .claude/hooks/session-start.sh | Regenerated header branding/source. |
| .claude/hooks/session-start.ps1 | Regenerated header branding/source. |
| .claude/hooks/protect-templates.sh | Retort branding + updated protection messaging. |
| .claude/hooks/protect-templates.ps1 | Retort branding + updated protection messaging. |
| .claude/hooks/protect-sensitive.sh | Regenerated header branding/source. |
| .claude/hooks/protect-sensitive.ps1 | Regenerated header branding/source. |
| .claude/hooks/pre-push-validate.sh | Regenerated header branding/source. |
| .claude/hooks/guard-destructive-commands.sh | Regenerated header branding/source. |
| .claude/hooks/guard-destructive-commands.ps1 | Regenerated header branding/source. |
| .claude/hooks/budget-guard-check.sh | Regenerated header branding/source. |
| .claude/commands/validate.md | Retort branding + updated regenerate command + repo name. |
| .claude/commands/test.md | Retort branding/source refresh. |
| .claude/commands/team-testing.md | Retort branding/source refresh. |
| .claude/commands/team-strategic-ops.md | Retort branding/source refresh. |
| .claude/commands/team-security.md | Retort branding/source refresh. |
| .claude/commands/team-quality.md | Retort branding/source refresh. |
| .claude/commands/team-product.md | Retort branding/source refresh. |
| .claude/commands/team-infra.md | Retort branding/source refresh. |
| .claude/commands/team-frontend.md | Retort branding/source refresh. |
| .claude/commands/team-forge.md | Retort branding/source refresh. |
| .claude/commands/team-docs.md | Retort branding/source refresh. |
| .claude/commands/team-devops.md | Retort branding/source refresh. |
| .claude/commands/team-data.md | Retort branding/source refresh. |
| .claude/commands/team-cost-ops.md | Retort branding/source refresh. |
| .claude/commands/team-backend.md | Retort branding/source refresh. |
| .claude/commands/sync.md | Retort branding + regenerate command updates. |
| .claude/commands/sync-backlog.md | Retort branding/source refresh. |
| .claude/commands/start.md | Retort branding + wording updates. |
| .claude/commands/security.md | Retort branding/source refresh. |
| .claude/commands/scaffold.md | Retort branding/source refresh. |
| .claude/commands/review.md | Retort branding phrasing update. |
| .claude/commands/project-status.md | Retort branding/source refresh. |
| .claude/commands/preflight.md | Retort branding/source refresh. |
| .claude/commands/plan.md | Retort branding/source refresh. |
| .claude/commands/orchestrate.md | Retort branding/source refresh. |
| .claude/commands/infra-eval.md | Retort branding/source refresh. |
| .claude/commands/import-issues.md | Retort branding/source refresh. |
| .claude/commands/format.md | Retort branding/source refresh. |
| .claude/commands/feature-review.md | Retort branding + naming updates. |
| .claude/commands/feature-flow.md | Retort branding/source refresh. |
| .claude/commands/feature-configure.md | Retort branding/source refresh. |
| .claude/commands/expand.md | Retort branding + regenerate command update. |
| .claude/commands/document-history.md | Retort branding/source refresh. |
| .claude/commands/doctor.md | Retort branding + wording updates. |
| .claude/commands/discover.md | Retort branding/source refresh. |
| .claude/commands/deploy.md | Retort branding/source refresh. |
| .claude/commands/cost.md | Retort wording update. |
| .claude/commands/cost-centres.md | Retort branding/source refresh. |
| .claude/commands/check.md | Retort branding/source refresh. |
| .claude/commands/build.md | Retort branding/source refresh. |
| .claude/commands/brand.md | Retort branding/source refresh. |
| .claude/commands/backlog.md | Retort branding/source refresh. |
| .claude/agents/vendor-arbitrage-analyst.md | Regenerated Retort header block. |
| .claude/agents/ui-designer.md | Regenerated Retort header block. |
| .claude/agents/token-efficiency-engineer.md | Regenerated Retort header block. |
| .claude/agents/test-lead.md | Regenerated Retort header block. |
| .claude/agents/team-validator.md | Regenerated Retort header block. |
| .claude/agents/spec-compliance-auditor.md | Regenerated Retort header block. |
| .claude/agents/security-auditor.md | Regenerated Retort header block. |
| .claude/agents/role-architect.md | Regenerated Retort header block. |
| .claude/agents/roadmap-tracker.md | Regenerated Retort header block. |
| .claude/agents/retrospective-analyst.md | Regenerated Retort header block. |
| .claude/agents/release-manager.md | Regenerated Retort header block. |
| .claude/agents/release-coordinator.md | Regenerated Retort header block. |
| .claude/agents/prompt-engineer.md | Regenerated Retort header block. |
| .claude/agents/project-shipper.md | Regenerated Retort header block. |
| .claude/agents/product-manager.md | Regenerated Retort header block. |
| .claude/agents/portfolio-analyst.md | Regenerated Retort header block. |
| .claude/agents/model-economist.md | Regenerated Retort header block. |
| .claude/agents/mission-definer.md | Regenerated Retort header block. |
| .claude/agents/integration-tester.md | Regenerated Retort header block. |
| .claude/agents/input-clarifier.md | Regenerated Retort header block. |
| .claude/agents/infra.md | Regenerated Retort header block. |
| .claude/agents/impact-assessor.md | Regenerated Retort header block. |
| .claude/agents/growth-analyst.md | Regenerated Retort header block. |
| .claude/agents/grant-hunter.md | Regenerated Retort header block. |
| .claude/agents/governance-advisor.md | Regenerated Retort header block. |
| .claude/agents/frontend.md | Regenerated Retort header block. |
| .claude/agents/flow-designer.md | Regenerated Retort header block. |
| .claude/agents/feature-ops.md | Regenerated Retort header block. |
| .claude/agents/expansion-analyst.md | Regenerated Retort header block. |
| .claude/agents/environment-manager.md | Regenerated Retort header block. |
| .claude/agents/devops.md | Regenerated Retort header block. |
| .claude/agents/dependency-watcher.md | Regenerated Retort header block. |
| .claude/agents/data.md | Regenerated Retort header block. |
| .claude/agents/coverage-tracker.md | Regenerated Retort header block. |
| .claude/agents/cost-ops-monitor.md | Regenerated Retort header block. |
| .claude/agents/content-strategist.md | Regenerated Retort header block. |
| .claude/agents/brand-guardian.md | Regenerated Retort header block. |
| .claude/agents/backend.md | Regenerated Retort header block. |
| .claude/agents/adoption-strategist.md | Regenerated Retort header block. |
| .ai/windsurfrules | Update generated-header references + sync command naming. |
| .ai/cursorrules | Update generated-header references + sync command naming. |
| .ai/continuerules | Update generated-header references + sync command naming. |
| .ai/README.md | Retort branding/source header update. |
| .agents/skills/validate/SKILL.md | Retort branding + repo name update. |
| .agents/skills/test/SKILL.md | Retort branding + repo name update. |
| .agents/skills/sync/SKILL.md | Retort branding + repo name update. |
| .agents/skills/sync-backlog/SKILL.md | Retort branding + repo name update. |
| .agents/skills/start/SKILL.md | Retort branding + repo name update. |
| .agents/skills/security/SKILL.md | Retort branding + repo name update. |
| .agents/skills/scaffold/SKILL.md | Retort branding + repo name update. |
| .agents/skills/review/SKILL.md | Retort branding + repo name update. |
| .agents/skills/project-status/SKILL.md | Retort branding + repo name update. |
| .agents/skills/preflight/SKILL.md | Retort branding + repo name update. |
| .agents/skills/plan/SKILL.md | Retort branding + repo name update. |
| .agents/skills/orchestrate/SKILL.md | Retort branding + repo name update. |
| .agents/skills/infra-eval/SKILL.md | Retort branding + repo name update. |
| .agents/skills/import-issues/SKILL.md | Retort branding + repo name update. |
| .agents/skills/format/SKILL.md | Retort branding + repo name update. |
| .agents/skills/feature-review/SKILL.md | Retort branding + repo name update. |
| .agents/skills/feature-flow/SKILL.md | Retort branding + repo name update. |
| .agents/skills/feature-configure/SKILL.md | Retort branding + repo name update. |
| .agents/skills/expand/SKILL.md | Retort branding + repo name update. |
| .agents/skills/document-history/SKILL.md | Retort branding + repo name update. |
| .agents/skills/doctor/SKILL.md | Retort branding + repo name update. |
| .agents/skills/discover/SKILL.md | Retort branding + repo name update. |
| .agents/skills/deploy/SKILL.md | Retort branding + repo name update. |
| .agents/skills/cost/SKILL.md | Retort branding + repo name update. |
| .agents/skills/cost-centres/SKILL.md | Retort branding + repo name update. |
| .agents/skills/check/SKILL.md | Retort branding + repo name update. |
| .agents/skills/build/SKILL.md | Retort branding + repo name update. |
| .agents/skills/brand/SKILL.md | Retort branding + repo name update. |
| .agents/skills/backlog/SKILL.md | Retort branding + repo name update. |
| .agents/skills/analyze-agents/SKILL.md | Retort branding + repo name update. |
| .agentkit/templates/windsurf/teams/TEMPLATE.md | Update generated-file instructions to Retort. |
| .agentkit/templates/windsurf/rules/project.md | Retort framework name in rules. |
| .agentkit/templates/scripts/setup-agentkit-branch-governance.sh | Output text updated to Retort. |
| .agentkit/templates/scripts/setup-agentkit-branch-governance.ps1 | Output text updated to Retort. |
| .agentkit/templates/scripts/resolve-merge.sh | Comment updated to Retort terminology. |
| .agentkit/templates/scripts/resolve-merge.ps1 | Comment updated to Retort terminology. |
| .agentkit/templates/scripts/consolidate-branches.ps1 | Retort sync command in post-steps. |
| .agentkit/templates/root/UNIFIED_AGENT_TEAMS.md | Switch headers + sync command to Retort. |
| .agentkit/templates/root/SECURITY.md | Retort naming + regenerate command. |
| .agentkit/templates/root/RUNBOOK_AI.md | CLI command naming updated to Retort. |
| .agentkit/templates/root/QUALITY_GATES.md | Switch headers + wording to Retort. |
| .agentkit/templates/root/MIGRATIONS.md | Retort naming + regenerate command. |
| .agentkit/templates/root/CONTRIBUTING.md | Retort CLI invocation updates. |
| .agentkit/templates/root/COMMAND_GUIDE.md | Retort naming in guidance text. |
| .agentkit/templates/root/CHANGELOG.md | Retort naming in template. |
| .agentkit/templates/root/AGENT_TEAMS.md | Retort naming in overview. |
| .agentkit/templates/root/AGENT_BACKLOG.md | Retort headers + wording update. |
| .agentkit/templates/renovate/renovate.json | Retort naming in package rule description. |
| .agentkit/templates/language-instructions/README.md | Retort naming in docs. |
| .agentkit/templates/headers/GENERATED.md | Generated header updated to Retort + retort:sync. |
| .agentkit/templates/github/workflows/retrospective-quality.yml | Header regenerate command updated to Retort. |
| .agentkit/templates/github/workflows/pr-validation.yml | Header regenerate command updated to Retort. |
| .agentkit/templates/github/workflows/documentation-validation.yml | Header regenerate command updated to Retort. |
| .agentkit/templates/github/workflows/documentation-quality.yml | Header regenerate command updated to Retort. |
| .agentkit/templates/github/workflows/dependency-audit.yml | Header regenerate command updated to Retort. |
| .agentkit/templates/github/workflows/coverage-report.yml | Header regenerate command updated to Retort. |
| .agentkit/templates/github/workflows/breaking-change-detection.yml | Header regenerate command updated to Retort. |
| .agentkit/templates/github/scripts/setup-branch-protection.sh | Retort naming in script output + label description. |
| .agentkit/templates/github/scripts/setup-branch-protection.ps1 | Retort naming in script output + label description. |
| .agentkit/templates/github/scripts/resolve-merge.sh | Retort naming in script header comments. |
| .agentkit/templates/github/scripts/resolve-merge.ps1 | Retort naming in script header comments. |
| .agentkit/templates/github/scripts/README.md | Retort naming + sync invocation. |
| .agentkit/templates/github/CODEOWNERS | Retort naming in header/comment. |
| .agentkit/templates/gemini/config.yaml | Retort naming in generator comment. |
| .agentkit/templates/docs/reference/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/reference/04_contributing.md | Retort header regenerate command. |
| .agentkit/templates/docs/reference/03_changelog.md | Retort header regenerate command. |
| .agentkit/templates/docs/reference/02_faq.md | Retort naming + regenerate command. |
| .agentkit/templates/docs/reference/01_glossary.md | Retort naming + sync command identifier. |
| .agentkit/templates/docs/product/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/product/04_personas.md | Retort header regenerate command. |
| .agentkit/templates/docs/product/03_roadmap.md | Retort header regenerate command. |
| .agentkit/templates/docs/product/02_user_stories.md | Retort header regenerate command. |
| .agentkit/templates/docs/product/01_prd.md | Retort header regenerate command. |
| .agentkit/templates/docs/operations/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/operations/05_slos_slis.md | Retort header regenerate command. |
| .agentkit/templates/docs/operations/04_troubleshooting.md | Retort header regenerate command. |
| .agentkit/templates/docs/operations/03_incident_response.md | Retort header regenerate command. |
| .agentkit/templates/docs/operations/02_monitoring.md | Retort header regenerate command. |
| .agentkit/templates/docs/operations/01_deployment.md | Retort header regenerate command. |
| .agentkit/templates/docs/integrations/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/integrations/03_sdk.md | Retort header regenerate command. |
| .agentkit/templates/docs/integrations/02_webhooks.md | Retort header regenerate command. |
| .agentkit/templates/docs/integrations/01_external_apis.md | Retort header regenerate command. |
| .agentkit/templates/docs/history/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/engineering/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/engineering/07_changelog.md | Retort header regenerate command. |
| .agentkit/templates/docs/engineering/06_pr_documentation.md | Retort header regenerate command. |
| .agentkit/templates/docs/engineering/05_security.md | Retort header regenerate command. |
| .agentkit/templates/docs/engineering/04_git_workflow.md | Retort header regenerate command. |
| .agentkit/templates/docs/engineering/03_testing.md | Retort header regenerate command. |
| .agentkit/templates/docs/engineering/02_coding_standards.md | Retort header regenerate command. |
| .agentkit/templates/docs/engineering/01_setup.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/specs/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/specs/04_data_models.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/specs/03_api_spec.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/specs/02_technical_spec.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/specs/01_functional_spec.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/diagrams/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/decisions/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/decisions/06-code-quality-maintainability-signal-tooling.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/decisions/05-dependency-supply-chain-detection-tooling.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/decisions/04-static-security-analysis-depth-tooling.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/decisions/03-tooling-strategy.md | Retort header regenerate command + updated ADR link text. |
| .agentkit/templates/docs/architecture/decisions/02-fallback-policy-tokens-problem.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/decisions/01-adopt-agentkit-forge.md | ADR title/content updated to Retort. |
| .agentkit/templates/docs/architecture/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/architecture/01_overview.md | Retort header regenerate command. |
| .agentkit/templates/docs/api/README.md | Retort header regenerate command. |
| .agentkit/templates/docs/api/06_versioning.md | Retort header regenerate command. |
| .agentkit/templates/docs/api/05_errors.md | Retort header regenerate command. |
| .agentkit/templates/docs/api/04_examples.md | Retort header regenerate command. |
| .agentkit/templates/docs/api/03_authentication.md | Retort header regenerate command. |
| .agentkit/templates/docs/api/02_endpoints.md | Retort header regenerate command. |
| .agentkit/templates/docs/api/01_overview.md | Retort header regenerate command. |
| .agentkit/templates/docs/README.md | Retort naming + regenerate command. |
| .agentkit/templates/cursor/teams/TEMPLATE.mdc | Update generated-file instructions to Retort. |
| .agentkit/templates/cursor/rules/project-context.mdc | Retort framework name in rules. |
| .agentkit/templates/cursor/commands/TEMPLATE.md | Retort lifecycle naming. |
| .agentkit/templates/copilot/prompts/TEMPLATE.prompt.md | Retort lifecycle naming. |
| .agentkit/templates/copilot/copilot-instructions.md | Retort framework naming + sync command. |
| .agentkit/templates/copilot/agents/TEMPLATE.agent.md | Retort generated-file instructions. |
| .agentkit/templates/claude/state/schema.json | Schema title updated to Retort. |
| .agentkit/templates/claude/rules/typescript.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/testing.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/template-protection.md | Retort naming + regenerate command. |
| .agentkit/templates/claude/rules/security.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/rust.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/quality.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/python.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/pr-base-branch.md | New PR base branch guard rule template. |
| .agentkit/templates/claude/rules/iac.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/git-workflow.md | Retort naming + regenerate command. |
| .agentkit/templates/claude/rules/dotnet.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/documentation.md | Retort naming + regenerate command. |
| .agentkit/templates/claude/rules/dependency-management.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/ci-cd.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/blockchain.md | Retort header + regenerate command. |
| .agentkit/templates/claude/rules/agent-conduct.md | Retort naming + generate command. |
| .agentkit/templates/claude/hooks/protect-templates.sh | Retort wording in hook output. |
| .agentkit/templates/claude/hooks/protect-templates.ps1 | Retort wording in hook output. |
| .agentkit/templates/claude/commands/validate.md | Retort header + regenerate command. |
| .agentkit/templates/claude/commands/sync.md | Retort header + regenerate command. |
| .agentkit/templates/claude/commands/start.md | Retort header + wording updates. |
| .agentkit/templates/claude/commands/review.md | Retort wording update. |
| .agentkit/templates/claude/commands/project-review.md | Retort wording update. |
| .agentkit/templates/claude/commands/feature-review.md | Retort wording update. |
| .agentkit/templates/claude/commands/feature-configure.md | Retort wording update. |
| .agentkit/templates/claude/commands/expand.md | Retort header + regenerate command. |
| .agentkit/templates/claude/commands/doctor.md | Retort wording update. |
| .agentkit/templates/claude/commands/cost.md | Retort wording update. |
| .agentkit/templates/claude/CLAUDE.md | Adds integrationBranch + PR target branch guidance. |
| .agentkit/templates/ai/windsurfrules | Retort generated marker + sync command. |
| .agentkit/templates/ai/cursorrules | Retort generated marker + sync command. |
| .agentkit/templates/ai/continuerules | Retort generated marker + sync command. |
| .agentkit/package.json | Adds retort:* scripts + runtime rename. |
| .agentkit/overlays/retort/settings.yaml | New overlay with integrationBranch=dev. |
| .agentkit/overlays/TEMPLATE/settings.yaml | Documents new integrationBranch setting. |
| .agentkit/engines/node/src/weighted-scorer.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/validate.mjs | Accept both Retort/Forge generated markers. |
| .agentkit/engines/node/src/tracker-adapter.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/tool-manager.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/template-utils.mjs | Retort generated marker + header insertion logic. |
| .agentkit/engines/node/src/task-protocol.mjs | Retort naming incl. Node requirement error text. |
| .agentkit/engines/node/src/task-cli.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/sync-guard.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/sync-backlog-runner.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/suggestion-store.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/spec-validator.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/runner.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/review-runner.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/project-completeness.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/plan-runner.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/orchestrator.mjs | Retort naming in status output. |
| .agentkit/engines/node/src/linear-adapter.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/issue-normalizer.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/init.mjs | Retort naming in intro text. |
| .agentkit/engines/node/src/import-issues.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/healthcheck.mjs | Retort naming in output headings. |
| .agentkit/engines/node/src/handoff.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/github-adapter.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/feature-manager.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/expansion-analyzer.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/events.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/event-emitter.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/doctor.mjs | Retort merge-driver markers expectation update. |
| .agentkit/engines/node/src/discover.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/cost-tracker.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/cli.mjs | Updates CLI branding/output prefixes to Retort. |
| .agentkit/engines/node/src/check.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/budget-guard.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/brand-resolver.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/backlog-viewer.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/backlog-store.mjs | Retort naming in rendered footer. |
| .agentkit/engines/node/src/agent-integration.mjs | Retort naming in header comment. |
| .agentkit/engines/node/src/agent-analysis.mjs | Retort naming in rendered docs. |
| .agentkit/engines/node/src/tests/template-utils.test.mjs | Updates expected generated marker text. |
| .agentkit/engines/node/src/tests/sync-integration.test.mjs | Updates expected generated marker/branding. |
| .agentkit/engines/node/src/tests/cli.test.mjs | Updates expected CLI branding text. |
| .agentkit/engines/node/src/tests/brand-resolver.test.mjs | Updates expected brand identifier. |
| @@ -679,7 +679,7 @@ export function getGeneratedHeader(version, repoName, ext, vars = {}) { | |||
| const syncCmd = | |||
| pm === 'npm' ? 'npm run -C .agentkit agentkit:sync' : `${pm} -C .agentkit agentkit:sync`; | |||
There was a problem hiding this comment.
The generated header now says “GENERATED by Retort …” but still instructs users to run agentkit:sync. This will propagate incorrect regenerate instructions across many generated files (and contradict the templates that now refer to retort:sync). Update syncCmd to use retort:sync (including the npm run form), and then update the affected unit/integration tests that currently assert agentkit:sync.
Suggested change
| pm === 'npm' ? 'npm run -C .agentkit agentkit:sync' : `${pm} -C .agentkit agentkit:sync`; | |
| pm === 'npm' ? 'npm run -C .agentkit retort:sync' : `${pm} -C .agentkit retort:sync`; |
| const header = getGeneratedHeader(version, repoName, ext); | ||
| if (!header) return content; // JSON / template — no comment syntax | ||
| if (content.includes('GENERATED by AgentKit Forge')) return content; // already present | ||
| if (content.includes('GENERATED by Retort')) return content; // already present |
There was a problem hiding this comment.
insertHeader only detects the new Retort marker. During the transition, files that still contain the legacy GENERATED by AgentKit Forge header will get a second Retort header prepended, producing duplicated headers. Consider treating the legacy marker as “already present” too (similar to what validate.mjs now accepts) to avoid double-headers, and rely on a full regen to migrate markers when appropriate.
Suggested change
| if (content.includes('GENERATED by Retort')) return content; // already present | |
| if (content.includes('GENERATED by Retort') || content.includes('GENERATED by AgentKit Forge')) return content; // already present (new or legacy marker) |
| if echo "$FILE_PATH" | grep -qE "$pattern"; then | ||
| jq -n \ | ||
| --arg reason "Blocked: '${FILE_PATH}' is an AgentKit Forge source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run '{{packageManager}} -C .agentkit agentkit:sync'." \ | ||
| --arg reason "Blocked: '${FILE_PATH}' is an Retort source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run '{{packageManager}} -C .agentkit retort:sync'." \ |
There was a problem hiding this comment.
The message uses incorrect grammar (“is an Retort source file”). Please change to “is a Retort source file” (and apply the same fix anywhere else this phrase appears, including the PowerShell variant and generated hook outputs).
Suggested change
| --arg reason "Blocked: '${FILE_PATH}' is an Retort source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run '{{packageManager}} -C .agentkit retort:sync'." \ | |
| --arg reason "Blocked: '${FILE_PATH}' is a Retort source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run '{{packageManager}} -C .agentkit retort:sync'." \ |
| ## Template & Generated-Format Issue Filing | ||
|
|
||
| When a finding targets a **generated file** (any file containing `<!-- GENERATED by AgentKit Forge`) or an **AgentKit template** (`.agentkit/templates/**`) AND is classified **critical** or **high**, file an issue in the project's configured tracker immediately — do not wait for user confirmation. | ||
| When a finding targets a **generated file** (any file containing `<!-- GENERATED by Retort`) or an **Retort template** (`.agentkit/templates/**`) AND is classified **critical** or **high**, file an issue in the project's configured tracker immediately — do not wait for user confirmation. |
There was a problem hiding this comment.
“an Retort template” should be “a Retort template” for correct grammar. This string is user-facing in the generated command instructions and should be corrected (and similarly in any other templates where the same phrasing occurs).
Suggested change
| When a finding targets a **generated file** (any file containing `<!-- GENERATED by Retort`) or an **Retort template** (`.agentkit/templates/**`) AND is classified **critical** or **high**, file an issue in the project's configured tracker immediately — do not wait for user confirmation. | |
| When a finding targets a **generated file** (any file containing `<!-- GENERATED by Retort`) or a **Retort template** (`.agentkit/templates/**`) AND is classified **critical** or **high**, file an issue in the project's configured tracker immediately — do not wait for user confirmation. |
1. template-utils.mjs syncCmd: 'agentkit:sync' → 'retort:sync' in the generated GENERATED header's Regenerate instruction (line 680) 2. template-utils.mjs insertHeader: treat legacy 'GENERATED by AgentKit Forge' marker as "already present" to prevent double-headers during transition (line 721) 3. protect-templates.sh/.ps1: "is an Retort source file" → "is a Retort source file" (grammar fix, line 50) 4. review.md / project-review.md: "an Retort template" → "a Retort template" (grammar fix, line 239) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Resolves all merge conflicts: - Hook files (.claude/hooks/*.sh, *.ps1): kept HEAD (retort:sync) - Generated output files (workflows, docs READMEs, etc.): kept --ours - template-utils.mjs: took dev version (better insertHeader that strips legacy AgentKit Forge headers rather than skipping them) - Reapplied syncCmd fix: retort:sync not agentkit:sync Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
| @@ -3,7 +3,7 @@ | |||
| <!-- Regenerate: pnpm -C .agentkit agentkit:sync --> | |||
There was a problem hiding this comment.
The regenerate instruction in the header still references agentkit:sync, while the rest of the file has been rebranded to Retort. Update the header regenerate command to pnpm -C .agentkit retort:sync to keep the file’s instructions consistent.
Suggested change
| <!-- Regenerate: pnpm -C .agentkit agentkit:sync --> | |
| <!-- Regenerate: pnpm -C .agentkit retort:sync --> |
| - PR titles must use Conventional Commits format: `type(scope): description` — CI rejects non-conforming titles | ||
| - Breaking changes (`!:` or `BREAKING` in PR title) require a `## Breaking Changes` section in the PR body | ||
| - Never edit files marked `GENERATED by AgentKit Forge — DO NOT EDIT` — modify `.agentkit/spec/` and run sync | ||
| - Never edit files marked `GENERATED by Retort — DO NOT EDIT` — modify `.agentkit/spec/` and run sync |
There was a problem hiding this comment.
The regenerate instruction in the header still references agentkit:sync, while the rest of the file has been rebranded to Retort. Update the header regenerate command to pnpm -C .agentkit retort:sync to keep the file’s instructions consistent.
|
|
||
| # /doctor | ||
|
|
||
| Runs AgentKit Forge diagnostics: spec validation, overlay sanity checks, template availability, project.yaml completeness hints, and suggested next actions for fixing setup issues. |
There was a problem hiding this comment.
This doc mixes AgentKit Forge and Retort in the same command description. Since the template/header was updated to Retort, the body line describing what /doctor runs should also be updated to Retort terminology to avoid confusing users about which tool/framework they’re using.
| ## Purpose | ||
|
|
||
| Diagnose AgentKit Forge setup and spec quality issues quickly. | ||
| Diagnose Retort setup and spec quality issues quickly. |
There was a problem hiding this comment.
This doc mixes AgentKit Forge and Retort in the same command description. Since the template/header was updated to Retort, the body line describing what /doctor runs should also be updated to Retort terminology to avoid confusing users about which tool/framework they’re using.
| - Files with `<!-- GENERATED by AgentKit Forge — DO NOT EDIT -->` are sync output | ||
| - **Never** edit them directly — modify `.agentkit/spec/` and run `agentkit sync` | ||
| - Files with `<!-- GENERATED by Retort — DO NOT EDIT -->` are sync output | ||
| - **Never** edit them directly — modify `.agentkit/spec/` and run `retort sync` |
There was a problem hiding this comment.
The guidance here uses retort sync, while many other generated headers/instructions in this PR use pnpm -C .agentkit retort:sync. To reduce operator error, standardize on a single canonical invocation (preferably the same one used in generated file headers) across the docs.
Suggested change
| - **Never** edit them directly — modify `.agentkit/spec/` and run `retort sync` | |
| - **Never** edit them directly — modify `.agentkit/spec/` and run `pnpm -C .agentkit retort:sync` |
| foreach ($pattern in $protectedPatterns) { | ||
| if ($filePath -match $pattern) { | ||
| $reason = "Blocked: '$filePath' is an Retort source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run 'pnpm -C .agentkit retort:sync'." | ||
| $reason = "Blocked: '$filePath' is a Retort source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run 'pnpm -C .agentkit retort:sync'." |
There was a problem hiding this comment.
Same issue as the Bash template: the message mixes Retort with agentkit-forge repository. Align the wording (or make the upstream repo name configurable) so PowerShell users get the same accurate guidance as Bash users.
Suggested change
| $reason = "Blocked: '$filePath' is a Retort source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run 'pnpm -C .agentkit retort:sync'." | |
| $reason = "Blocked: '$filePath' is an AgentKit Forge source file. These files are the upstream source-of-truth and must not be modified directly by AI agents. To propose changes, create a PR to the agentkit-forge repository targeting the relevant spec or template. If you need to change project configuration, edit the YAML specs in .agentkit/spec/ and run 'pnpm -C .agentkit retort:sync'." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
integrationBranchfield to overlaysettings.yaml— distinct fromdefaultBranch, specifying where PRs should land (typicallydev, notmain)overlays/retort/settings.yamlwithintegrationBranch: devso retort's own output is correctly configured### PR Target Branchsection with the correctgh pr create --baseinvocation.agentkit/templates/claude/rules/pr-base-branch.md— a hookify-style guard rule that warns whengh pr createomits--base <integrationBranch>integrationBranchvariableMotivation
PR #437 was an auto-generated reverse-merge caused by PRs #435/#436 accidentally targeting
maininstead ofdev. This change makes the correct base branch:CLAUDE.md(Integration Branch header + PR Target Branch section).claude/rules/pr-base-branch.mdTest plan
pnpm -C .agentkit retort:validatepasses — 0 warningsCLAUDE.mdshows- **Integration Branch** (PR target): dev.claude/rules/pr-base-branch.mdgenerated with correctdevbranch reference__TEMPLATE__/settings.yamldocumentsintegrationBranchfield with commentoverlays/retort/settings.yamlcreated withintegrationBranch: dev🤖 Generated with Claude Code